Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Sun, 14 Feb 2010 17:31:45 +0000 (18:31 +0100)
committerJan D. <jan.h.d@swipnet.se>
Sun, 14 Feb 2010 17:31:45 +0000 (18:31 +0100)
commit7cf992bbb0156ed3ba4e3ebbb4c1474ddf3e79eb
treead01e1534c76d9a133e05021467e38c08dbfadac
parent8c8193871928ca6296ecd181cae1c90fe9cf6121
parentda1df31e003d780fb32cdd8e2b41c78e07e8a3e1
Merge from trunk